Merge branch 'MDL-65544-master' of git://github.com/damyon/moodle
authorSara Arjona <sara@moodle.com>
Mon, 13 May 2019 07:40:37 +0000 (09:40 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 13 May 2019 07:40:37 +0000 (09:40 +0200)

Trivial merge