Merged revisions 291265 via svnmerge from