Merge branch 'master'
authormarkus schnalke <meillo@marmaro.de>
Fri, 23 Oct 2015 12:26:49 +0000 (14:26 +0200)
committermarkus schnalke <meillo@marmaro.de>
Fri, 23 Oct 2015 12:26:49 +0000 (14:26 +0200)

Trivial merge