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