Merge branch 'MDL-65581-master' of git://github.com/bmbrands/moodle
authorSara Arjona <sara@moodle.com>
Mon, 13 May 2019 19:19:11 +0000 (21:19 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 13 May 2019 19:19:11 +0000 (21:19 +0200)

Trivial merge