Merged revisions 59188 via svnmerge from