Merge branch 'ps/guess-repo-name-at-root'