Merge branch 'MDL-65183-MOODLE-master' of https://github.com/kristian-94/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Jun 2019 02:34:13 +0000 (10:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Jun 2019 02:34:13 +0000 (10:34 +0800)

Trivial merge