Fix cropping big images
Merge branch 'issue-uploads'