Merge branch 'MDL-63198-master' of git://github.com/rezaies/moodle
authorSara Arjona <sara@moodle.com>
Wed, 7 Aug 2019 03:07:50 +0000 (11:07 +0800)
committerSara Arjona <sara@moodle.com>
Wed, 7 Aug 2019 03:07:50 +0000 (11:07 +0800)

Trivial merge