Merged revisions 51243 via svnmerge from