Merge branch 'MDL-67155' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Dec 2019 04:12:28 +0000 (12:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Dec 2019 04:12:28 +0000 (12:12 +0800)

Trivial merge