Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 28 Apr 2016 14:16:44 +0000 (16:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 28 Apr 2016 14:16:44 +0000 (16:16 +0200)

Trivial merge