Merge branch 'MDL-67638_master' of https://github.com/nguyenphuctien/moodle
authorSara Arjona <sara@moodle.com>
Wed, 15 Jan 2020 11:19:34 +0000 (12:19 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 15 Jan 2020 11:19:34 +0000 (12:19 +0100)

Trivial merge