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