Merge branch 'MDL-68149' of https://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 25 Mar 2020 16:10:01 +0000 (00:10 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 25 Mar 2020 16:10:01 +0000 (00:10 +0800)

Trivial merge