Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 20:33:08 +0000 (21:33 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 6 Mar 2017 20:33:08 +0000 (21:33 +0100)

Trivial merge