Git merges in Moodle 3.9.7 by Jun Pataleta

commit be2eb84be9813e110a0d1c5e0d6d2232ac466e07
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 07 May 2021 10:30:52 +0800
Tag:    v3.9.7

Merge branch 'MDL-71395-39-2' of git://github.com/marinaglancy/moodle into MOODLE_39_STABLE


commit ce2058c4c24c1fade6a15b715867e32f248d9691
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 30 Apr 2021 10:34:30 +0800
Tag:    v3.9.7

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


commit 5d2d5bc542bafb14bb3f08c456e697704af2f9ae
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 29 Apr 2021 15:05:22 +0800
Tag:    v3.9.7

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


commit 1d217301ada78f3cb60a3b25d8b55f8c39ee280d
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 23 Apr 2021 12:40:29 +0800
Tag:    v3.9.7

Merge branch 'MDL-71171_39' of git://github.com/mdjnelson/moodle into MOODLE_39_STABLE


commit 9e3b15f31eb536cdb86acab5bc8b20dd5e1e66d3
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 22 Apr 2021 18:54:41 +0800
Tag:    v3.9.7

Merge branch 'MDL-71170_39' of git://github.com/mdjnelson/moodle into MOODLE_39_STABLE


commit 92df285f49f89631862dabb64a243a7f2b01e0c7
Author: Jun Pataleta <jun@moodle.com>
Date:   Thu, 22 Apr 2021 11:53:53 +0800
Tag:    v3.9.7

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


commit 49f994fb03be1e22280fb7a92531177213d9348e
Author: Jun Pataleta <jun@moodle.com>
Date:   Tue, 20 Apr 2021 09:23:14 +0800
Tag:    v3.9.7

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