Force thumbnails to be 32x32 (42x42 beceause of padding and stuff)
Merge remote-tracking branch 'origin/master'