Merge branch 'MDL-64525' of https://github.com/NeillM/moodle into master
authorSara Arjona <sara@moodle.com>
Tue, 1 Sep 2020 12:17:48 +0000 (14:17 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 1 Sep 2020 12:17:48 +0000 (14:17 +0200)

Trivial merge