Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 May 2016 10:34:29 +0000 (12:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 May 2016 10:34:29 +0000 (12:34 +0200)

Trivial merge