Merge branch 'MDL-64437-master' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 20 Aug 2019 06:19:34 +0000 (14:19 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 20 Aug 2019 06:19:34 +0000 (14:19 +0800)

Trivial merge