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