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