Update version number to reflect merge.