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

version fixes