Merge branch 'master_MDL-59857' of https://github.com/danmarsden/moodle