Merge branch 'MDL-53240-master-filetypewidgets' of git://github.com/mudrd8mz/moodle