Merged revisions 324678 via svnmerge from