Merged revisions 251986 via svnmerge from