Merge branch 'MDL-59106_master-fix2' of git://github.com/dmonllao/moodle