Merge branch 'MDL-60407-master' of git://github.com/vmdef/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 21 May 2019 10:44:52 +0000 (18:44 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 21 May 2019 10:44:52 +0000 (18:44 +0800)

Trivial merge