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

Trivial merge