Merge branch 'MDL-76607-401' of https://github.com/davewoloszyn/moodle into MOODLE_40...