Merged revisions 55869 via svnmerge from