Merge branch 'MDL-62320-master' of git://github.com/vmdef/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 05:47:21 +0000 (13:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 05:47:21 +0000 (13:47 +0800)

Trivial merge