Merge branch 'MDL-67027' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Oct 2019 00:43:12 +0000 (08:43 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Oct 2019 00:43:12 +0000 (08:43 +0800)

Trivial merge