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

Trivial merge