Merged revisions 66916 via svnmerge from