Merge branch '2016.11-develop-setup' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 12 Jul 2017 16:36:48 +0000 (18:36 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 12 Jul 2017 16:36:48 +0000 (18:36 +0200)

Trivial merge