Merged revisions 55868 via svnmerge from