Merged revisions 291284 via svnmerge from