Merged revisions 321926 via svnmerge from