Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Mar 2016 10:38:34 +0000 (11:38 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Mar 2016 10:38:34 +0000 (11:38 +0100)

Trivial merge