Merge branch 'MDL-67965-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 14 Feb 2020 05:25:16 +0000 (13:25 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 14 Feb 2020 10:16:42 +0000 (11:16 +0100)

Trivial merge