Merge branch 'MDL-65315-master' of git://github.com/peterRd/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 4 Oct 2019 02:25:16 +0000 (10:25 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 4 Oct 2019 02:25:16 +0000 (10:25 +0800)

Trivial merge