Merged trunk changes 868-912 into the new-backend branch.
Authored by: delphidabbler 2010-09-24
Parent: [r913]
Child: [r915]