Merged revisions 51172 via svnmerge from