Merge branch 'MDL-72923-master' of https://github.com/michael-milette/moodle