Merge branch 'christoph' into manuel
Merge branch 'master' into manuel
Merge branch 'manuel'