Merged revisions 59215 via svnmerge from