Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Dec 2015 12:56:44 +0000 (13:56 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 3 Dec 2015 12:56:44 +0000 (13:56 +0100)

Trivial merge