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