Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 25 Jan 2016 08:09:02 +0000 (09:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 25 Jan 2016 08:09:02 +0000 (09:09 +0100)

Trivial merge