Merge branch 'MDL-54794_master' of https://github.com/dg711/moodle