Merge branch 'MDL-64346-master' of git://github.com/abgreeve/moodle
authorSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 14:38:12 +0000 (15:38 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 14:38:12 +0000 (15:38 +0100)

Trivial merge