Bump version numbers.

This PR merges the release branch back into master.