Merged revisions 324849 via svnmerge from