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