Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Mar 2016 11:19:04 +0000 (12:19 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Mar 2016 11:19:04 +0000 (12:19 +0100)

Trivial merge