Remove .vcsh suffix for non-vcsh repos.
Merge branch 'mr'