fixes for beta9
Merge pull request #4024 from kurund/version-fixes

version fixes for beta9