Merge branch 'MDL-64598-master' of https://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Tue, 6 Aug 2019 07:29:52 +0000 (15:29 +0800)
committerSara Arjona <sara@moodle.com>
Tue, 6 Aug 2019 07:29:52 +0000 (15:29 +0800)

Trivial merge