Merge branch 'jc/remote-multi-url'