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

Trivial merge