Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 6 Jan 2015 11:27:11 +0000 (12:27 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 6 Jan 2015 11:27:11 +0000 (12:27 +0100)

Trivial merge