Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Aug 2016 08:48:27 +0000 (10:48 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Aug 2016 08:48:27 +0000 (10:48 +0200)

Trivial merge