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