Merge branch 'MDL-68592-master' of https://github.com/kabalin/moodle
authorSara Arjona <sara@moodle.com>
Fri, 22 May 2020 15:55:23 +0000 (17:55 +0200)
committerSara Arjona <sara@moodle.com>
Fri, 22 May 2020 15:55:23 +0000 (17:55 +0200)

Trivial merge