Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Jun 2016 15:25:03 +0000 (17:25 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 9 Jun 2016 15:25:03 +0000 (17:25 +0200)

Trivial merge