Merge branch 'MDL-50642' of https://github.com/ecampbell/moodle