Merge branch 'MDL-67204-master' of https://github.com/mwehr/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Jan 2020 00:37:26 +0000 (08:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Jan 2020 00:37:26 +0000 (08:37 +0800)

Trivial merge