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