Merge branch 'MDL-60975-master' of https://github.com/Kathrin84/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Dec 2019 04:16:35 +0000 (12:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Dec 2019 04:16:35 +0000 (12:16 +0800)

Trivial merge