Merge branch 'MDL-67788-master' of git://github.com/ferranrecio/moodle
authorSara Arjona <sara@moodle.com>
Wed, 15 Apr 2020 07:53:03 +0000 (09:53 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 15 Apr 2020 07:53:03 +0000 (09:53 +0200)

Trivial merge