Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:39:51 +0000 (13:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 2 Aug 2017 11:39:51 +0000 (13:39 +0200)

Trivial merge