Bump patch version.
Merge branches.