Merge branch 'MDL-68241-master' of git://github.com/ferranrecio/moodle
authorSara Arjona <sara@moodle.com>
Thu, 14 May 2020 07:55:35 +0000 (09:55 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 14 May 2020 07:55:35 +0000 (09:55 +0200)

Trivial merge