Pull `upstream` changes into `master`