Merged revisions 325877 via svnmerge from