Merged revisions 290674 via svnmerge from