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