Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 17 Apr 2015 18:54:47 +0000 (20:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 17 Apr 2015 18:54:47 +0000 (20:54 +0200)

Trivial merge