Merged revisions 53879 via svnmerge from