Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 7 Apr 2015 11:22:30 +0000 (13:22 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 7 Apr 2015 11:22:30 +0000 (13:22 +0200)

Trivial merge