Merge branch 'master' into mirio/glowplant
authorMirio <opivy@hotmail.de>
Fri, 23 Jan 2015 19:10:45 +0000 (20:10 +0100)
committerMirio <opivy@hotmail.de>
Fri, 23 Jan 2015 19:10:45 +0000 (20:10 +0100)

Trivial merge