Merge in stuff from upstream