Fixed issue in thumbnail generation
Merge branch '2.0'