Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 1 Nov 2016 07:54:44 +0000 (08:54 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 1 Nov 2016 07:54:44 +0000 (08:54 +0100)

Trivial merge