Merged revisions 51781 via svnmerge from