Bump the version number.
Merge branch 'master' into windows