Merged revisions 55397 via svnmerge from