Merge branch '2014.09' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 7 Aug 2015 17:16:57 +0000 (19:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 7 Aug 2015 17:16:57 +0000 (19:16 +0200)

Trivial merge