Merge branch 'nd/remote-plural-ours-plus-theirs' into maint