Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 30 Dec 2016 09:35:46 +0000 (10:35 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 30 Dec 2016 09:35:46 +0000 (10:35 +0100)

Trivial merge