and the thumbnail too
Merge pull request #2548 from andymckay/928242

and the thumbnail too