Merge branch 'MDL-63996-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 31 Dec 2019 07:19:24 +0000 (15:19 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 31 Dec 2019 07:19:24 +0000 (15:19 +0800)

Trivial merge