Rebase develop onto master

This is the result of:
git checkout develop
git rebase master
git merge origin/develop  # No diffs here, just merge history.