Merging in upstream updates