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