Merge
authormarkus schnalke <meillo@marmaro.de>
Sun, 25 Oct 2015 19:02:33 +0000 (20:02 +0100)
committermarkus schnalke <meillo@marmaro.de>
Sun, 25 Oct 2015 19:02:33 +0000 (20:02 +0100)

Trivial merge