Merge branch 'MDL-65769-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Jul 2019 01:30:43 +0000 (09:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 17 Jul 2019 01:30:43 +0000 (09:30 +0800)

Trivial merge