Merge branch 'rr/remote-helper-doc'