Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 09:27:40 +0000 (11:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Apr 2016 09:27:40 +0000 (11:27 +0200)

Trivial merge