Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 18 Dec 2014 11:43:45 +0000 (12:43 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 18 Dec 2014 11:43:45 +0000 (12:43 +0100)

Trivial merge