Merged revisions 67424 via svnmerge from