Merge branch '2016.11-develop-setup' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 30 Jun 2017 06:53:12 +0000 (08:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 30 Jun 2017 06:53:12 +0000 (08:53 +0200)

Trivial merge