Merge branch 'master' into Justin/erbium
authorMirio <opivy@hotmail.de>
Sat, 15 Oct 2016 02:31:12 +0000 (04:31 +0200)
committerMirio <opivy@hotmail.de>
Sat, 15 Oct 2016 02:31:12 +0000 (04:31 +0200)

Trivial merge