Merge branch 'MDL-69902-310' of https://github.com/marinaglancy/moodle into MOODLE_31...