Merged revisions 290289 via svnmerge from