Merge branch 'MDL-65703-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Jun 2019 04:33:34 +0000 (12:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Jun 2019 04:33:34 +0000 (12:33 +0800)

Trivial merge