Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Nov 2016 15:46:43 +0000 (16:46 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 30 Nov 2016 15:46:43 +0000 (16:46 +0100)

Trivial merge