Merge branch 'MDL-66234_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Aug 2019 06:25:20 +0000 (14:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Aug 2019 06:25:20 +0000 (14:25 +0800)

Trivial merge