Merged revisions 294047 via svnmerge from