Merged revisions 66414 via svnmerge from