Merge pull request #4779 from popcornmix/real_thumbnail