Merge branch 'MDL-39155' of https://github.com/jacks92/moodle