Merged revisions 279502 via svnmerge from