I can't believe I have to do this. You would expect people to be sensible
Merge remote-tracking branch 'origin/master'