Git merges in Moodle 3.8.7 by Jun Pataleta

commit 7595f8d9f17f650de577f37f098f837d8db392e7
Author: Jun Pataleta <jun@moodle.com>
Date:   Fri, 08 Jan 2021 12:15:06 +0800
Tag:    v3.8.7

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