Merge branch 'MDL-65849-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Jan 2020 05:17:08 +0000 (13:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 7 Jan 2020 05:17:08 +0000 (13:17 +0800)

Trivial merge