Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jun 2016 14:54:22 +0000 (16:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jun 2016 14:54:22 +0000 (16:54 +0200)

Trivial merge