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