Merge branch 'MDL-33884' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Aug 2019 06:33:11 +0000 (14:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Aug 2019 06:33:11 +0000 (14:33 +0800)

Trivial merge