Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Aug 2015 09:05:35 +0000 (11:05 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 13 Aug 2015 09:05:35 +0000 (11:05 +0200)

Trivial merge