Merge branch 'MDL-69146' of https://github.com/stronk7/moodle into master