Merge branch 'wip-MDL-59377-master-3' of git://github.com/marinaglancy/moodle