Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Tue, 31 Jan 2017 12:56:22 +0000 (13:56 +0100)
committerMirio <opivy@hotmail.de>
Tue, 31 Jan 2017 12:56:22 +0000 (13:56 +0100)

Trivial merge