Issue 1449 - Convert repo_type into an OrderedDirct to prefer HG over Git
Merge remote-tracking branch 'upstream/master'