Merged revisions 278023 via svnmerge from