Merge branch 'MDL-76429_400' of https://github.com/stronk7/moodle into MOODLE_400_STABLE