Merge pull request #2859 from pulpe/FunnyOrDie_thumb