Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Jun 2016 15:24:29 +0000 (17:24 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Jun 2016 15:24:29 +0000 (17:24 +0200)

Trivial merge