Merged revisions 59228 via svnmerge from