Merge branch 'MDL-66671-master' of https://github.com/dthies/moodle
authorSara Arjona <sara@moodle.com>
Mon, 9 Mar 2020 17:49:02 +0000 (18:49 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 9 Mar 2020 17:49:02 +0000 (18:49 +0100)

Trivial merge