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