Merged revisions 53880 via svnmerge from