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