Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:28:14 +0000 (12:28 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:28:14 +0000 (12:28 +0100)

Trivial merge