Merge branch 'jk/ssh-funny-url' into maint-2.7