Merge branch 'MDL-63906_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 1 Apr 2019 02:32:10 +0000 (10:32 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 1 Apr 2019 02:32:10 +0000 (10:32 +0800)

Trivial merge