Merge branch 'MDL-65409-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jul 2019 03:35:23 +0000 (11:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 16 Jul 2019 03:35:23 +0000 (11:35 +0800)

Trivial merge