Merged revisions 279619 via svnmerge from