version fixes
Merge pull request #3583 from yashodha/master

version fixes