Merge branch 'MDL-65651-master' of https://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Aug 2019 03:57:56 +0000 (11:57 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Aug 2019 03:57:56 +0000 (11:57 +0800)

Trivial merge