Branch for CodeGear (Borland) specific fixes

[SVN r39356]
Patches for Codegear C++ Builder 2009

[SVN r48981]
Merge from trunk

[SVN r49099]