Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 10:02:15 +0000 (12:02 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Mar 2016 10:02:15 +0000 (12:02 +0200)

Trivial merge