Merge "Workaround for thumbnail pre rendering with PHP < 5.4.7"