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

Trivial merge