Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:17:08 +0000 (17:17 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 16 Mar 2016 16:17:08 +0000 (17:17 +0100)

Trivial merge