Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 May 2016 12:02:40 +0000 (14:02 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 May 2016 12:02:40 +0000 (14:02 +0200)

Trivial merge