Update version number
Merge branch 'master' into github_master