Merge branch 'MDL-69115-39' of git://github.com/junpataleta/moodle into MOODLE_39_STABLE
authorSara Arjona <sara@moodle.com>
Mon, 13 Jul 2020 12:24:15 +0000 (14:24 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 13 Jul 2020 12:24:15 +0000 (14:24 +0200)

Trivial merge