Merge branch '2013.10' into pu/2013.10-longrun
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 20 Jan 2014 11:49:47 +0000 (12:49 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 20 Jan 2014 11:49:47 +0000 (12:49 +0100)

Trivial merge