Merged revision(s) 3356-3485, 3021-3355 from trunk/Src:
Updated with changes in trunk/Src as at release 4.8.0.
Authored by: delphidabbler 2013-09-13
Parent: [r3485]
Child: [r3487]