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