Merge branch '2015.07'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Sep 2015 15:29:48 +0000 (17:29 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 21 Sep 2015 15:29:48 +0000 (17:29 +0200)

Trivial merge