Merge branch 'MDL-65777-master' of git://github.com/mihailges/moodle
authorSara Arjona <sara@moodle.com>
Wed, 5 Jun 2019 07:00:40 +0000 (09:00 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 5 Jun 2019 07:00:40 +0000 (09:00 +0200)

Trivial merge