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