Merged revisions 51236 via svnmerge from