Merge branch 'MDL-65679-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Aug 2019 05:17:43 +0000 (13:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Aug 2019 05:17:43 +0000 (13:17 +0800)

Trivial merge