Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Feb 2015 16:30:50 +0000 (17:30 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 27 Feb 2015 16:30:50 +0000 (17:30 +0100)

Trivial merge