Merge branch 'MDL-65506-master' of git://github.com/rezaies/moodle
authorSara Arjona <sara@moodle.com>
Fri, 28 Jun 2019 10:16:14 +0000 (12:16 +0200)
committerSara Arjona <sara@moodle.com>
Fri, 28 Jun 2019 10:16:14 +0000 (12:16 +0200)

Trivial merge