Merge pull request #3047 from pulpe/yahoo_thumb