Merge branch 'MDL-59443-master-filetypesvalidation' of git://github.com/mudrd8mz...