Merge branch 'MDL-68525-master' of git://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 28 Apr 2020 04:43:33 +0000 (12:43 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Apr 2020 08:19:56 +0000 (10:19 +0200)

Trivial merge