Merge branch 'MDL-67187_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 11 Nov 2019 14:22:08 +0000 (22:22 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 11 Nov 2019 14:22:08 +0000 (22:22 +0800)

Trivial merge