Merged revisions 66363 via svnmerge from