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