Merge branch 'MDL-67384-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 16 Jan 2020 02:24:40 +0000 (10:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 16 Jan 2020 02:24:40 +0000 (10:24 +0800)

Trivial merge