Merged revision(s) 3456-3583, 3314-3458 from trunk:
Updated with changes in trunk/Src after applying changes from release 4.8.1 to it.
Resolved conflicts with .vi files by ignoring merged changes.
Authored by: delphidabbler 2013-09-18
Parent: [r3583]
Child: [r3585]