Merged another bug fix from trunk

svn path=; revision=84728