Merged revisions 294823 via svnmerge from