Merge branch 'MDL-66163-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Jul 2019 23:44:54 +0000 (07:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Jul 2019 23:44:54 +0000 (07:44 +0800)

Trivial merge