Git merges in Moodle 3.9.8 by Jun Pataleta

commit e7c0ddb9429cfac34f2651e379789c032ad24090
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 08 Jul 2021 16:36:58 +0800
Tag:    v3.9.8

Merge branch 'MDL-71919-39-fix' of https://github.com/cescobedo/moodle into MOODLE_39_STABLE


commit e9d63ac29cd3dcf30cc44065ae44115e1b4eb259
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 08 Jul 2021 12:17:04 +0800
Tag:    v3.9.8

Merge branch 'MDL-70594_39' of https://github.com/stronk7/moodle into MOODLE_39_STABLE


commit dc9258574d1bb9ef2e6a8f7226d335f5261ea52b
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 20 May 2021 12:29:36 +0800
Tag:    v3.9.8

Merge branch 'MDL-71157-39' of git://github.com/sarjona/moodle into MOODLE_39_STABLE