Merge branch '2016.11-develop-setup' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 23 Jun 2017 09:19:04 +0000 (11:19 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 23 Jun 2017 09:19:04 +0000 (11:19 +0200)

Trivial merge