use fully specified version
Merge branch 'master' into controlversionfixes