Merged revisions 66159 via svnmerge from