Merge branch 'MDL-65810' of git://github.com/stronk7/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 4 Jun 2019 07:25:18 +0000 (15:25 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 4 Jun 2019 07:25:18 +0000 (15:25 +0800)

Trivial merge