Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 2 May 2016 09:08:46 +0000 (11:08 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 2 May 2016 09:08:46 +0000 (11:08 +0200)

Trivial merge