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