Merge branch 'MDL-64075' of https://github.com/OdyX/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jan 2020 06:15:46 +0000 (14:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Jan 2020 06:15:46 +0000 (14:15 +0800)

Trivial merge