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