Merge branch 'MDL-78549-402' of https://github.com/junpataleta/moodle into MOODLE_402...