Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 26 Oct 2015 11:26:38 +0000 (12:26 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 26 Oct 2015 11:26:38 +0000 (12:26 +0100)

Trivial merge