Merged revisions 298051 via svnmerge from