Merged revisions 294745 via svnmerge from