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