Merge "Merger: ensure_cloned() now looks for '.git'"