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