Merge branch 'MDL-53247_fix' of git://github.com/dmonllao/moodle