Merge branch 'MDL-74929-400' of https://github.com/bmbrands/moodle into MOODLE_400_STABLE