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