Merge branch 'MDL-62968-master' of git://github.com/mickhawkins/moodle
authorSara Arjona <sara@moodle.com>
Fri, 18 Jan 2019 11:38:14 +0000 (12:38 +0100)
committerSara Arjona <sara@moodle.com>
Fri, 18 Jan 2019 11:38:14 +0000 (12:38 +0100)

Trivial merge