Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Aug 2016 16:26:11 +0000 (18:26 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 10 Aug 2016 16:26:11 +0000 (18:26 +0200)

Trivial merge