Merge branch 'MDL-63458' of https://github.com/rlorenzo/moodle
authorSara Arjona <sara@moodle.com>
Tue, 30 Jul 2019 03:59:18 +0000 (11:59 +0800)
committerSara Arjona <sara@moodle.com>
Tue, 30 Jul 2019 03:59:18 +0000 (11:59 +0800)

Trivial merge