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