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