Merging in upstream changes