Merged revisions 51176 via svnmerge from