Support XDG git config location
Merge remote-tracking branch 'upstream/master'