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