Merge branch 'MDL-57791_master-fix5' of git://github.com/dmonllao/moodle