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