version fixes
Merge pull request #4341 from yashodha/version-fix

version fixes