Merged revision(s) 3315-3356, 3021-3314 from trunk/Src:
Updated with changes in trunk/Src after applying changes from release 4.7.2 to it.
Authored by: delphidabbler 2013-08-27
Parent: [r3356]
Child: [r3358]