Merged trunk changes 1089-1093 and 1095 into the v4-dev branch.
Made conflict resolution changes.
Some files are physically unchanged and have changes only to their svn:mergeinfo property.
Authored by: delphidabbler 2010-11-28
Parent: [r1097]
Child: [r1099]