applied ticket 6010

svn path=; revision=84592