Merge branch 'smidt' into christian
Merge branch 'christian' into smidt