Merge branch 'wip-MDL-50633-master2' of https://github.com/marinaglancy/moodle