This is really problem #3, not #2.
Stub for the real problem #2.
Merge remote-tracking branch 'upstream/master'