Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Jan 2017 13:47:09 +0000 (14:47 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 5 Jan 2017 13:47:09 +0000 (14:47 +0100)

Trivial merge