Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Nov 2015 14:04:23 +0000 (15:04 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Nov 2015 14:04:23 +0000 (15:04 +0100)

Trivial merge