Git merges in Moodle 3.9.5 by Jake Dallimore

commit 6e74df2344903e43c463a629cc8fffcd5f0bc529
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 29 Jan 2021 15:45:03 +0800
Tag:    v3.9.5

Merge branch 'MDL-66979-39-7' of git://github.com/andrewnicols/moodle into MOODLE_39_STABLE


commit 88a9d4cff124a3baa9648dd9307b7dc251658e40
Author: Jake Dallimore <jake@moodle.com>
Date:   Fri, 22 Jan 2021 11:30:49 +0800
Tag:    v3.9.5

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