Merged trunk changes 1107, 1111 and 1182-1185 into the new-backend branch.
Some files are physically unchanged and have changes only to their svn:mergeinfo property.
Authored by: delphidabbler 2010-12-06
Parent: [r1189]
Child: [r1191]