Fixing handling of editable "git" URLs
Merge branch 'master' into develop