Merge branch 'MDL-67217_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 25 Nov 2019 08:13:01 +0000 (16:13 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 25 Nov 2019 08:13:01 +0000 (16:13 +0800)

Trivial merge