Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:12:50 +0000 (18:12 +0100)
committerMirio <opivy@hotmail.de>
Wed, 9 Mar 2016 17:12:50 +0000 (18:12 +0100)

Trivial merge