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