Merged revisions 51350 via svnmerge from