Fix support for local and remote git repositories
Merge branch 'mymaster'