Merge branch 'MDL-66210_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 21 Aug 2019 11:48:10 +0000 (19:48 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 21 Aug 2019 11:48:10 +0000 (19:48 +0800)

Trivial merge