Merge branch 'MDL-65779-master' of git://github.com/peterRd/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Jun 2019 04:07:40 +0000 (12:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Jun 2019 04:07:40 +0000 (12:07 +0800)

Trivial merge