Merge branch 'MDL-65697-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 28 May 2019 05:31:41 +0000 (13:31 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 28 May 2019 05:31:41 +0000 (13:31 +0800)

Trivial merge