Merge in edits from upstream