Merge branch 'MDL-66262' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 26 Sep 2019 03:34:45 +0000 (11:34 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 26 Sep 2019 03:34:45 +0000 (11:34 +0800)

Trivial merge