Merged revisions 294049 via svnmerge from