Merge branch 'MDL-68328-dlfix' of https://github.com/cengage/moodle