Merge branch 'MDL-65451' of https://github.com/marinaglancy/moodle into master