Autogenerated PortableGit for 015aa71ef18c047ce8509ffb2f9e4bb0e3e73f13
Merge remote-tracking branch 'upstream/PortableGit'