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

Trivial merge