Property changes in v4-dev due to final partial merge of all revisions from trunk
Authored by: delphidabbler 2012-02-27
Parent: [r1755]
Child: [r1757]