Git merges in Moodle 4.0.x by Travis CI

commit b68dc5c4922e720c68c05915ee10a42de21bcf03
Author: Travis CI <travis@localhost>
Date:   Tue, 23 Mar 2021 15:56:00 +0800
Tag:    v4.0.0-beta

Merge branch 'MDL-71149' of https://github.com/stronk7/moodle


commit fa7c534032c363088a8c98e4125f4a09d6e5fe24
Author: Travis CI <travis@localhost>
Date:   Tue, 23 Mar 2021 13:57:13 +0800
Tag:    v4.0.0-beta

Merge branch 'MDL-71084-master' of git://github.com/peterRd/moodle


commit d23b1488b35796763df4a02933dbdc712f00d720
Author: Travis CI <travis@localhost>
Date:   Tue, 23 Mar 2021 13:53:01 +0800
Tag:    v4.0.0-beta

Merge branch 'MDL-69792-master' of git://github.com/sarjona/moodle


commit e8baa93c446db59e3775787bf4fe74a7d966c635
Author: Travis CI <travis@localhost>
Date:   Tue, 23 Mar 2021 13:46:20 +0800
Tag:    v4.0.0-beta

Merge branch 'MDL-71104-master-2' of git://github.com/mickhawkins/moodle