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