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