Merged revisions 274417 via svnmerge from