Merge branch 'master' into justin/erbium
authorMirio <opivy@hotmail.de>
Tue, 7 Mar 2017 12:33:21 +0000 (13:33 +0100)
committerMirio <opivy@hotmail.de>
Tue, 7 Mar 2017 12:33:21 +0000 (13:33 +0100)

Trivial merge