Merge in a bug fixed in EDK tree.