Merge branch 'christoph's-branch'
Merge branch 'master' into christoph's-branch