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