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