Fixes a bug in ImageModel and upload helper
Merge branch 'origin/master'