Fixed issue: Security problems with uploaded files in administration
Merge remote-tracking branch 'origin/master'