Merged revisions 51262 via svnmerge from