Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Apr 2015 15:37:38 +0000 (17:37 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 29 Apr 2015 15:37:38 +0000 (17:37 +0200)

Trivial merge