Merged revisions 67526 via svnmerge from