Merge branch '2014.09' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jul 2015 10:01:21 +0000 (12:01 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jul 2015 10:01:21 +0000 (12:01 +0200)

Trivial merge