Merge branch 'MDL-65469-master' of git://github.com/peterRd/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Jun 2019 06:18:40 +0000 (14:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Jun 2019 06:18:40 +0000 (14:18 +0800)

Trivial merge