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