Merge master with versionUpdate branch.