Merged revisions 211953 via svnmerge from