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