Merged revisions 274157 via svnmerge from