Property changes in v4-dev due to 2nd partial merge of all revisions from trunk
Authored by: delphidabbler 2012-02-27
Parent: [r1754]
Child: [r1756]