Merge branch 'MDL-67039_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 4 Nov 2019 03:53:40 +0000 (11:53 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 4 Nov 2019 11:21:41 +0000 (19:21 +0800)

Trivial merge