Merge branch 'MDL-67246-master' of git://github.com/jleyva/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 14 Nov 2019 06:34:17 +0000 (14:34 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 14 Nov 2019 06:34:17 +0000 (14:34 +0800)

Trivial merge