Merged revisions 67862 via svnmerge from