Sync our fork with upstream now that our fixes have been pushed there. I opted to merge rather then rebase since the recent revert commit messages are useful.
