Merge branch 'MDL-65643' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 May 2019 06:24:49 +0000 (14:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 May 2019 06:24:49 +0000 (14:24 +0800)

Trivial merge