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

[SVN r21427]
This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'.

[SVN r21515]
merged from trunk


[SVN r21580]
merged from trunk


[SVN r21697]