Merge branch 'MDL-68246-master-IR-squashed' of git://github.com/mickhawkins/moodle
authorSara Arjona <sara@moodle.com>
Thu, 14 May 2020 10:31:29 +0000 (12:31 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 14 May 2020 10:31:29 +0000 (12:31 +0200)

Trivial merge