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

Trivial merge