Merge branch 'MDL-67100-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 Nov 2019 03:07:40 +0000 (11:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 1 Nov 2019 03:07:40 +0000 (11:07 +0800)

Trivial merge