#143: Fix duplicated thumbnail filename with different thumb size
Merge remote-tracking branch 'origin/master'