version fixes
Merge pull request #3878 from yashodha/version-fixes

version fixes