Branch for CodeGear (Borland) specific fixes
Merge from trunk
Merge from trunk
Patches for Codegear C++ Builder 2009