Merge branch 'MDL-66434-master' of https://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Sep 2019 04:40:38 +0000 (12:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Sep 2019 04:40:38 +0000 (12:40 +0800)

Trivial merge