Merged revisions 53085 via svnmerge from