Merge branch 'imp/2014.11-performance_application-2014.09' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 20 Apr 2015 08:46:53 +0000 (10:46 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 20 Apr 2015 08:46:53 +0000 (10:46 +0200)

Trivial merge