Note: Intel C++ Compiler for Windows is not supported in this change Closes issue 4361 --HG-- branch : trunk