Merge branch 'MDL-65768-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 18 Jul 2019 01:08:52 +0000 (09:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 18 Jul 2019 01:08:52 +0000 (09:08 +0800)

Trivial merge