Merge branch 'MDL-65973-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Mon, 1 Jul 2019 11:13:26 +0000 (13:13 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 1 Jul 2019 11:13:26 +0000 (13:13 +0200)

Trivial merge