Merge branch 'MDL-74808-master' of https://github.com/lameze/moodle