Merge branch 'MDL-69414' of https://github.com/nadavkav/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Aug 2020 04:58:13 +0000 (12:58 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Aug 2020 22:47:48 +0000 (00:47 +0200)

Trivial merge