Merged revisions 53850 via svnmerge from