Merged revisions 67872 via svnmerge from