Merge branch 'wip-MDL-67339-master' of https://github.com/Beedell/moodle
authorSara Arjona <sara@moodle.com>
Mon, 2 Dec 2019 17:06:15 +0000 (18:06 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 2 Dec 2019 17:06:15 +0000 (18:06 +0100)

Trivial merge