Merged revisions 57049 via svnmerge from