Merge branch 'MDL-65518-master-fix1' of https://github.com/damyon/moodle
authorSara Arjona <sara@moodle.com>
Fri, 10 May 2019 09:58:50 +0000 (11:58 +0200)
committerSara Arjona <sara@moodle.com>
Fri, 10 May 2019 09:58:50 +0000 (11:58 +0200)

Trivial merge