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