Merge branch '2014.09' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Aug 2015 08:57:05 +0000 (10:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Aug 2015 08:57:05 +0000 (10:57 +0200)

Trivial merge