Git merges in Moodle 3.9.6 by Sara Arjona

commit 5fc3b83497d7faaf12be0793f8c30ad38bbe7e61
Author: Sara Arjona <sara@moodle.com>
Date:   Tue, 16 Mar 2021 15:27:09 +0800
Tag:    v3.9.6

Merge branch 'MDL-44613-integration-39' of git://github.com/mihailges/moodle into MOODLE_39_STABLE


commit 7215c71486e8dbf4125679de3c1edebfa7a8a44d
Author: Sara Arjona <sara@moodle.com>
Date:   Mon, 15 Mar 2021 22:54:05 +0800
Tag:    v3.9.6

Merge branch 'MDL-44613-39-1' of git://github.com/mihailges/moodle into MOODLE_39_STABLE


commit f4f6534b401b188a6c1616d8f5058227293a70b5
Author: Sara Arjona <sara@moodle.com>
Date:   Fri, 12 Mar 2021 00:18:47 +0800
Tag:    v3.9.6

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