Merge branch 'MDL-66806_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 18 Oct 2019 01:36:51 +0000 (09:36 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 18 Oct 2019 01:36:51 +0000 (09:36 +0800)

Trivial merge