Reintegrated v4-dev branch into trunk.
Trunk now contains v4 development tree
Authored by: delphidabbler 2012-02-27
Parent: [r1756]
Child: [r1758]