Merge
authormarkus schnalke <meillo@marmaro.de>
Tue, 27 Oct 2015 21:20:28 +0000 (22:20 +0100)
committermarkus schnalke <meillo@marmaro.de>
Tue, 27 Oct 2015 21:20:28 +0000 (22:20 +0100)

Trivial merge