Merge branch 'MDL-66178' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Aug 2019 01:17:29 +0000 (09:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Aug 2019 01:17:29 +0000 (09:17 +0800)

Trivial merge