Merge branch 'MDL-65469' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Jun 2019 01:17:35 +0000 (09:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 18 Jun 2019 01:17:35 +0000 (09:17 +0800)

Trivial merge