Merged revisions 55688 via svnmerge from