Merge branch 'MDL-69072-39' of git://github.com/andrewnicols/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Jul 2020 21:21:00 +0000 (23:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Jul 2020 21:23:45 +0000 (23:23 +0200)

Trivial merge