Merge branch 'MDL-64998' of git://github.com/Chocolate-lightning/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 24 Jun 2019 00:16:14 +0000 (08:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 24 Jun 2019 00:16:14 +0000 (08:16 +0800)

Trivial merge