Merge branch 'MDL-67681_master' of https://github.com/marxjohnson/moodle
authorSara Arjona <sara@moodle.com>
Tue, 4 Feb 2020 11:16:39 +0000 (12:16 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 4 Feb 2020 11:16:39 +0000 (12:16 +0100)

Trivial merge