Oops -- Merged revisions 53057 via svnmerge from