Merge branch 'MDL-68912' of https://github.com/rlorenzo/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 11 Jun 2020 03:01:05 +0000 (11:01 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 11 Jun 2020 03:01:05 +0000 (11:01 +0800)

Trivial merge