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