Merge branch 'MDL-56677_master-fix' of git://github.com/dmonllao/moodle