Merge branch 'MDL-65658-master' of git://github.com/Chocolate-lightning/moodle
authorSara Arjona <sara@moodle.com>
Mon, 3 Jun 2019 10:33:16 +0000 (12:33 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 3 Jun 2019 10:33:16 +0000 (12:33 +0200)

Trivial merge