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

version fixes