Merge branch 'MDL-68342-xsendfile-file' of https://github.com/brendanheywood/moodle