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