Merge branch 'MDL-66229-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Sep 2019 23:02:40 +0000 (07:02 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Sep 2019 23:02:40 +0000 (07:02 +0800)

Trivial merge