Merged revisions 55052 via svnmerge from