Merged revisions 279850 via svnmerge from