Merge branch 'MDL-65599-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 15 May 2019 07:24:12 +0000 (15:24 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 15 May 2019 07:24:12 +0000 (15:24 +0800)

Trivial merge