Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Mar 2016 14:39:24 +0000 (15:39 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 9 Mar 2016 14:39:24 +0000 (15:39 +0100)

Trivial merge