New code to handle scaling images on upload
Merge remote-tracking branch 'refs/remotes/origin/feature/imageuploadoptions' into feature/imageoptimization