Merge branch 'MDL-40481' of git://github.com/timhunt/moodle