Merged revisions 66503 via svnmerge from