Merge branch 'wip-MDL-50586-master-fix' of https://github.com/marinaglancy/moodle