Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Mar 2017 13:16:24 +0000 (14:16 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Mar 2017 13:16:24 +0000 (14:16 +0100)

Trivial merge