Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 16 Feb 2016 10:05:15 +0000 (11:05 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 16 Feb 2016 10:05:15 +0000 (11:05 +0100)

Trivial merge