Merge branch 'MDL-66919' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 18 Oct 2019 00:26:38 +0000 (08:26 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 18 Oct 2019 00:26:38 +0000 (08:26 +0800)

Trivial merge