Merged revisions 291075 via svnmerge from