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