Merged trunk changes 915-929 into the new-backend branch.
Authored by: delphidabbler 2010-10-23
Parent: [r930]
Child: [r932]