Merge branch 'MDL-67689-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 May 2020 02:13:43 +0000 (10:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 May 2020 02:36:54 +0000 (10:36 +0800)

Trivial merge