Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Apr 2016 09:09:00 +0000 (11:09 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Apr 2016 09:09:00 +0000 (11:09 +0200)

Trivial merge