Fixed: Strict standards notice when uploading a file through the frontend
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev