Merge pull request #6539 from ngld/fix-funnyordie