Don't show thumbnail on end by default
Merge branch 'master' into squares