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

diff --git a/RelNotes b/RelNotes
index cdb1b4853d82672422f455f022015014741ffecd..eb82eea64fef8ce0d4bcd18e4daab09aa53e026a 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.5.4.txt
\ No newline at end of file
+Documentation/RelNotes/2.8.3.txt
\ No newline at end of file