Merge branch 'MDL-67088-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 31 Oct 2019 03:07:56 +0000 (11:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 31 Oct 2019 03:07:56 +0000 (11:07 +0800)

Trivial merge