svn path=/stable/8/; revision=207524