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