Merge branch 'm39_MDL-67440' of https://github.com/danmarsden/moodle into MOODLE_39_S...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jul 2020 15:08:21 +0000 (17:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Jul 2020 15:08:21 +0000 (17:08 +0200)

Trivial merge