Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 19 Oct 2015 12:54:06 +0000 (14:54 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 19 Oct 2015 12:54:06 +0000 (14:54 +0200)

Trivial merge