Picture now shows up as thumbnail.
Merge remote-tracking branch 'origin/master'