Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 1 Apr 2015 16:00:31 +0000 (18:00 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 1 Apr 2015 16:00:31 +0000 (18:00 +0200)

Trivial merge