Merged revisions 51513 via svnmerge from