Merge branch 'master_MDL-44712' of git://github.com/danmarsden/moodle