Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Aug 2016 12:03:52 +0000 (14:03 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Aug 2016 12:03:52 +0000 (14:03 +0200)

Trivial merge