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