Merge branch 'MDL-76327-master' of https://github.com/andrewnicols/moodle