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