Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Sun, 25 Dec 2016 13:44:29 +0000 (14:44 +0100)
committerMirio <opivy@hotmail.de>
Sun, 25 Dec 2016 13:44:29 +0000 (14:44 +0100)

Trivial merge