Merge branch 'MDL-65708-master' of git://github.com/Chocolate-lightning/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 May 2019 06:46:41 +0000 (14:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 May 2019 06:46:41 +0000 (14:46 +0800)

Trivial merge