Merged revisions 51931 via svnmerge from