Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 20 Jun 2016 11:47:10 +0000 (13:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 20 Jun 2016 11:47:10 +0000 (13:47 +0200)

Trivial merge