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