Merge
authormarkus schnalke <meillo@marmaro.de>
Wed, 21 Oct 2015 15:39:15 +0000 (17:39 +0200)
committermarkus schnalke <meillo@marmaro.de>
Wed, 21 Oct 2015 15:39:15 +0000 (17:39 +0200)

Trivial merge