Merged revisions 56856 via svnmerge from