Merge branch 'MDL-68658' of https://github.com/stronk7/moodle