Fixing a fatal error in Frontendupload if s3 is enabled.
Merge remote-tracking branch 'origin/master'