Merged revisions 321685 via svnmerge from