Merge branch '2015.07'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Sep 2015 10:39:38 +0000 (12:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Sep 2015 10:39:38 +0000 (12:39 +0200)

Trivial merge