Merged revision(s) 3021-3045 from trunk/Src:
This comprises all changes made to trunk after merging changes from release 4.5.1.
Authored by: delphidabbler 2013-05-15
Parent: [r3045]
Child: [r3047]