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