Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:33:52 +0000 (21:33 +0100)
committerMirio <opivy@hotmail.de>
Fri, 10 Mar 2017 20:33:52 +0000 (21:33 +0100)

Trivial merge