Merged revisions 293341 via svnmerge from