Git merges in Moodle 3.7.7 by Adrian Greeve

commit 22665452a39b924232ba54a2d6bdc105adbb1dfd
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Thu, 28 May 2020 16:31:43 +0800
Tag:    v3.7.7

Merge branch 'MDL-68847-37' of https://github.com/snake/moodle into MOODLE_37_STABLE

commit 392741bd32ed42f10c45f56335d28c8f71599bf9
Author: Adrian Greeve <abgreeve@gmail.com>
Date:   Thu, 21 May 2020 08:34:49 +0800
Tag:    v3.7.7

Merge branch 'MDL-68733_37' of https://github.com/timhunt/moodle into MOODLE_37_STABLE