Merge branch 'master' into repo-in-url
Improvements suggested by @philschatz and @tmsp1
Merge branch 'repo-in-url' into testing