Merged revision(s) 3485-3582, 3021-3484 from trunk/Src: Updated with changes in trunk/Src after applying changes from release 4.8.1 to it.
Also committed recent changes to database test harness - this done in error.
Authored by: delphidabbler 2013-09-18
Parent: [r3582]
Child: [r3584]