Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:55:51 +0000 (15:55 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Jan 2016 14:55:51 +0000 (15:55 +0100)

Trivial merge