Merge branch 'MDL-28501-master' of https://github.com/mackensen/moodle into master
authorSara Arjona <sara@moodle.com>
Tue, 8 Sep 2020 11:27:55 +0000 (13:27 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 8 Sep 2020 11:27:55 +0000 (13:27 +0200)

Trivial merge