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