Merged revision(s) 3077-3223, 3021-3077 from trunk/Src:
This brings this branch into sync with changes in trunk from release v4.6.0 to v4.7.0.
Authored by: delphidabbler 2013-07-31
Parent: [r3223]
Child: [r3225]