svnmerge up to trunk revision 211147