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