Merge branch 'MDL-55320-fix' of https://github.com/lameze/moodle