Merged revisions 324652 via svnmerge from