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