Merge branch 'MDL-42451' of git://github.com/Chocolate-lightning/moodle
authorSara Arjona <sara@moodle.com>
Thu, 1 Aug 2019 01:53:05 +0000 (09:53 +0800)
committerSara Arjona <sara@moodle.com>
Thu, 1 Aug 2019 01:53:05 +0000 (09:53 +0800)

Trivial merge