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