Merged changes in trunk/Src after applying changes from release 4.7.1 to it.
Authored by: delphidabbler 2013-08-18
Parent: [r3315]
Child: [r3317]