Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Dec 2016 11:00:30 +0000 (12:00 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Dec 2016 11:00:30 +0000 (12:00 +0100)

Trivial merge