Merge branch 'MDL-65888-master' of git://github.com/mudrd8mz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Jun 2019 02:48:34 +0000 (10:48 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 17 Jun 2019 02:48:34 +0000 (10:48 +0800)

Trivial merge