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

[SVN r21427]
merged fixes


[SVN r21868]