Merge branch 'MDL-35983_equella_filename_dev' of git://github.com/dongsheng/moodle