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