This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'.
Merged fix for CWPro workaround update from trunk to branch.
Merged additional compiler-version updates from trunk to branch.