Update pull request commits

Had to rebase to master, and the commit SHAs all changed.