Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Jan 2017 09:46:07 +0000 (10:46 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Jan 2017 09:46:07 +0000 (10:46 +0100)

Trivial merge