Merged revisions 67158 via svnmerge from