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