Merge branch 'MDL-63250-master' of https://github.com/Kathrin84/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Sep 2019 04:33:20 +0000 (12:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Sep 2019 04:33:20 +0000 (12:33 +0800)

Trivial merge