Merged revisions 321330 via svnmerge from