Merge branch 'MDL-65573-master-2' of git://github.com/peterRd/moodle
authorSara Arjona <sara@moodle.com>
Tue, 14 Jan 2020 11:20:00 +0000 (12:20 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 14 Jan 2020 11:20:00 +0000 (12:20 +0100)

Trivial merge