Merged revisions 324685 via svnmerge from