Merge in upstream changes