Merged revisions 53079 via svnmerge from