Merge branch '2016.11-develop-setup' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 21 Mar 2017 14:50:50 +0000 (15:50 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 21 Mar 2017 14:50:50 +0000 (15:50 +0100)

Trivial merge