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

Trivial merge