Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Sep 2015 10:38:50 +0000 (12:38 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Sep 2015 10:38:50 +0000 (12:38 +0200)

Trivial merge