Merged revisions 293418 via svnmerge from