Merged revisions 51615 via svnmerge from