Merged revisions 67073 via svnmerge from