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