Merged revisions 279817 via svnmerge from