Merge branch 'MDL-59681-recursive-file' of https://github.com/brendanheywood/moodle