Merge branch 'MDL-66471' of https://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Thu, 21 May 2020 15:33:12 +0000 (17:33 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 21 May 2020 15:33:12 +0000 (17:33 +0200)

Trivial merge