Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Aug 2015 17:53:19 +0000 (19:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Aug 2015 17:53:19 +0000 (19:53 +0200)

Trivial merge