Merge branch 'MDL-66582-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 4 Nov 2019 11:39:24 +0000 (19:39 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Nov 2019 11:39:24 +0000 (19:39 +0800)

Trivial merge