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

version fixes