Merged revisions 66671 via svnmerge from