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

version fixes