Merge branch 'MDL-69583-310' of git://github.com/ferranrecio/moodle into MOODLE_310_S...
authorJun Pataleta <jun@moodle.com>
Thu, 15 Oct 2020 05:56:58 +0000 (13:56 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 15 Oct 2020 05:56:58 +0000 (13:56 +0800)

Trivial merge