Merge branch 'MDL-64669-master' of git://github.com/aanabit/moodle
authorSara Arjona <sara@moodle.com>
Mon, 8 Apr 2019 11:12:31 +0000 (13:12 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 8 Apr 2019 11:12:31 +0000 (13:12 +0200)

Trivial merge