Merged revisions 279504 via svnmerge from