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