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