Fix media preview. Removed temporary file during file upload.
Merge remote-tracking branch 'origin/master'