Remove an obsolete (and incorrect) config
Merge remote-tracking branch 'upstream/master'