Merged trunk changes 1089-1093 and 1095 into the new-backend branch.
Authored by: delphidabbler 2010-11-28
Parent: [r1096]
Child: [r1098]