Git merges in Moodle x.x.x by Shamim Rezaie

commit 3f0373cb7e5efa59095f092534026d585a24caba
Author: Shamim Rezaie <shamim@moodle.com>
Date:   Fri, 30 Oct 2020 11:59:34 +0800
Tag:    v3.10.0-rc1

Merge branch 'MDL-69390-310' of git://github.com/bmbrands/moodle into MDL-69390-310-test

commit 7d2514397920c512fbd066e3fb4aa6dfad05d8b5
Author: Shamim Rezaie <shamim@moodle.com>
Date:   Fri, 30 Oct 2020 11:56:03 +0800
Tag:    v3.9.3

Merge branch 'MDL-69390-39' of git://github.com/bmbrands/moodle into MDL-69390-39-test