make version task more robust
Merge branch 'hotfix/0.13.9'