fix for previous commit
Merge branch 'master' into myconf