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