Merged revisions 321871 via svnmerge from