Merge branch 'MDL-65101_master' of git://github.com/markn86/moodle
authorSara Arjona <sara@moodle.com>
Tue, 2 Jul 2019 12:50:04 +0000 (14:50 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 2 Jul 2019 12:50:04 +0000 (14:50 +0200)

Trivial merge