Merged revisions 59227 via svnmerge from