Merged revisions 59223 via svnmerge from