Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Feb 2015 16:38:03 +0000 (17:38 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 Feb 2015 16:38:03 +0000 (17:38 +0100)

Trivial merge