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