Updated with changes in trunk/Src after applying changes from release 4.8.3 to it.
Resolved conflicts with .vi files by ignoring merged changes.
Conflicts in Docs/License.html were resolve by rejecting trunk changes. Equivalent changes to those made in trunk have already been applied in r3705.
Changes to Src/3rdParty directory in trunk were not merged because that directory does not exist in parsnip. Similar changes to contents of 3rdParty has already been made in parsnip in r3703.