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