Merge branch 'MDL-67268-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 Nov 2019 04:08:33 +0000 (12:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 15 Nov 2019 04:08:33 +0000 (12:08 +0800)

Trivial merge