Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 00:35:25 +0000 (02:35 +0200)
committerMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 00:35:25 +0000 (02:35 +0200)

Trivial merge