Merge branch 'master' into matthiaskrgr/glowplant
authorMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:21:46 +0000 (17:21 +0100)
committerMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:21:46 +0000 (17:21 +0100)

Trivial merge