Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 9 Feb 2016 13:16:11 +0000 (14:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 9 Feb 2016 13:16:11 +0000 (14:16 +0100)

Trivial merge