Merged revisions 279916 via svnmerge from