Merged revisions 295869 via svnmerge from