Merged revisions 55435 via svnmerge from