Merged revisions 274579 via svnmerge from