Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 2 Feb 2017 08:11:50 +0000 (09:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 2 Feb 2017 08:11:50 +0000 (09:11 +0100)

Trivial merge