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