Merged revisions 324484 via svnmerge from