Merge in upstream repository