Merge pull request #10004 from annando/resize-on-upload