I apologise profusely. This is hard to test.

Typo...
Merge remote-tracking branch 'upstream/master'