Merge branch 'MDL-64432_master' of git://github.com/gjb2048/moodle
authorSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 11:57:22 +0000 (12:57 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 15 Jan 2019 11:57:22 +0000 (12:57 +0100)

Trivial merge