Merge branch 'MDL-67617-master' of git://github.com/lucaboesch/moodle
authorSara Arjona <sara@moodle.com>
Wed, 15 Jan 2020 11:43:00 +0000 (12:43 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 15 Jan 2020 11:43:00 +0000 (12:43 +0100)

Trivial merge