I forget what this implemented, but by gosh does it work.
Merge remote-tracking branch 'origin/master'