This commit was manufactured by cvs2svn to create branch 'RC_1_31_0'.
merged from trunk
merged from trunk
merged fixes