Merged revisions 55154 via svnmerge from