Merge branch 'MDL-67067-master' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 1 Nov 2019 02:07:13 +0000 (10:07 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 1 Nov 2019 02:07:13 +0000 (10:07 +0800)

Trivial merge