Merged revisions 51087 via svnmerge from