Merging the latest version into ours.