Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:29:44 +0000 (12:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 22 Mar 2017 11:29:44 +0000 (12:29 +0100)

Trivial merge