Rebase on upstream

Or the closest thing you can get to that from the github web interface