Merged revisions 66398 via svnmerge from