Merge branch 'MDL_56093' of https://github.com/eledia/moodle