Merge branch 'MDL-62835-master-1' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 4 Jun 2019 06:18:21 +0000 (14:18 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 4 Jun 2019 06:18:21 +0000 (14:18 +0800)

Trivial merge