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

[SVN r21427]
Merged fixes from trunk to branch


[SVN r21740]
Merged fixes from trunk to branch


[SVN r22011]
*** empty log message ***


[SVN r22075]
Merged fixes from trunk to branch


[SVN r22142]