Adding support for ssh upstreams
merge
Merge branch 'ptte-master'