Merged revision(s) 3710-4006, 3314-3711 from trunk:
Updated with changes in trunk/Src after applying changes from release 4.8.4 to it.
Resolved conflicts with .vi files by ignoring merged changes. Other conflicts were resolved manually by mixing "theirs" with "mine" in a way that makes sense in parsnip.