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