Merge branch 'MDL-66554-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Sep 2019 04:24:02 +0000 (12:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Sep 2019 04:24:02 +0000 (12:24 +0800)

Trivial merge