Merge branch 'MDL-65564-master' of git://github.com/marinaglancy/moodle
authorSara Arjona <sara@moodle.com>
Mon, 13 May 2019 08:39:10 +0000 (10:39 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 13 May 2019 08:39:10 +0000 (10:39 +0200)

Trivial merge