Stage 1
Stage 2
Perf tweak
Stage 3
Allow merge master
Merge branch 'master' into rewrite-remotes
Stage 4
Stage 5
Stage 6
Fix
Finish
Merge pull request #283 from zaggino/rewrite-remotes

Rewrite remotes