Merge branch 'MDL-65060-master' of git://github.com/aanabit/moodle
authorSara Arjona <sara@moodle.com>
Fri, 24 May 2019 10:34:23 +0000 (12:34 +0200)
committerSara Arjona <sara@moodle.com>
Fri, 24 May 2019 10:34:23 +0000 (12:34 +0200)

Trivial merge