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

version fixes