Merged trunk changes r654-660 into the new-backend branch.
Authored by: delphidabbler 2010-03-19
Parent: [r660]
Child: [r662]