Merge branch 'MDL-66946' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Oct 2019 04:54:06 +0000 (12:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 21 Oct 2019 04:54:06 +0000 (12:54 +0800)

Trivial merge