Merged revisions 261274 via svnmerge from