Merged revisions 266585 via svnmerge from