Minor adjustments for merge
Merge branch 'master' into python