Merge branch 'MDL-58584-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Feb 2020 05:45:34 +0000 (13:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Feb 2020 05:45:34 +0000 (13:45 +0800)

Trivial merge