Merged revisions 55799 via svnmerge from