Merge branch 'MDL-78684-master-fix-2' of https://github.com/lameze/moodle