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

Trivial merge