Merge branch 'MDL-67831-39' of git://github.com/bmbrands/moodle into MOODLE_39_STABLE
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2020 22:47:33 +0000 (00:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Aug 2020 22:47:33 +0000 (00:47 +0200)

Trivial merge