Merge branch 'MDL-71090' of git://github.com/paulholden/moodle