Merge branch 'MDL-81603' of https://github.com/paulholden/moodle