Merge branch 'imp/2014.11-performance_application-2014.09' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Jan 2015 13:10:57 +0000 (14:10 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Jan 2015 13:10:57 +0000 (14:10 +0100)

Trivial merge