Merged revisions 51302 via svnmerge from