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