Git merges in Moodle 3.9.6 by Eloy Lafuente (stronk7)

commit 6c712c9caf18e7d6f5138e6eadda2dfea78dc7cb
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Wed, 24 Mar 2021 17:51:13 +0800
Tag:    v3.9.6

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


commit 3265a02f6ce4d6b734485b2c818a4813782b6ee6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Fri, 19 Mar 2021 21:06:28 +0800
Tag:    v3.9.6

Merge branch 'install_39_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_39_STABLE


commit 5987bed350be700f043a286f95d06ba8ea3b80b6
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Mar 2021 07:12:19 +0800
Tag:    v3.9.6

Merge branch 'MDL-70726-3.9' of https://github.com/NashTechOpenUniversity/moodle into MOODLE_39_STABLE


commit b6d0dec01e2a1bd98f69a6c97c1d1c6cae8605ec
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Mar 2021 06:50:22 +0800
Tag:    v3.9.6

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


commit c0d519b4265d5704da78c8311ede41a89265cb68
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Mar 2021 06:42:25 +0800
Tag:    v3.9.6

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


commit 05c66fcebd0ae6cc1da304660b182961ae73edc0
Author: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date:   Thu, 11 Mar 2021 06:35:33 +0800
Tag:    v3.9.6

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