Merge branch 'MDL-68778-master' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Wed, 20 May 2020 09:47:27 +0000 (11:47 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 20 May 2020 09:47:27 +0000 (11:47 +0200)

Trivial merge