Really really fix for image_widget
Merge remote branch 'origin/hotfix/php684-really' into release/20130326