Merge branch 'MDL-78120-401' of https://github.com/lucaboesch/moodle into MOODLE_401_...