Merge branch 'MDL-65106-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Mar 2020 00:12:56 +0000 (08:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 5 Mar 2020 00:12:56 +0000 (08:12 +0800)

Trivial merge