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