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

Trivial merge