This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'.

[SVN r21427]
Merged fix for CWPro workaround update from trunk to branch.


[SVN r21655]
Merged additional compiler-version updates from trunk to branch.


[SVN r21712]