Merged revisions 262662 via svnmerge from