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