Merged revisions 59195 via svnmerge from