Merged trunk changes r712-714 into the new-backend branch.
Authored by: delphidabbler 2010-03-24
Parent: [r715]
Child: [r717]