Merged trunk changes r645-652 into the new-backend branch.
Authored by: delphidabbler 2010-03-18
Parent: [r652]
Child: [r654]