fixes to versions
Merge branch 'master' into build41a