Merge branch 'MDL-67174' of https://github.com/paulholden/moodle
authorSara Arjona <sara@moodle.com>
Sat, 9 Nov 2019 07:59:41 +0000 (08:59 +0100)
committerSara Arjona <sara@moodle.com>
Sat, 9 Nov 2019 07:59:41 +0000 (08:59 +0100)

Trivial merge