Merge branch 'MDL-68935-master' of git://github.com/jleyva/moodle into master
authorSara Arjona <sara@moodle.com>
Mon, 28 Sep 2020 09:40:37 +0000 (11:40 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 28 Sep 2020 09:40:37 +0000 (11:40 +0200)

Trivial merge