Fix typo
Merge branch 'master' into fix_image_scale_empty