Merge branch 'MDL-65839_master' of git://github.com/dmonllao/moodle
authorSara Arjona <sara@moodle.com>
Tue, 2 Jul 2019 08:41:35 +0000 (10:41 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 2 Jul 2019 08:41:35 +0000 (10:41 +0200)

Trivial merge