Merge pull request #957 from GawainLynch/master

Fix thumbnail issue introduced in pull #937