Merge in upstream fix.