Merge branch 'MDL-58268-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Jun 2019 07:03:05 +0000 (15:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Jun 2019 07:03:05 +0000 (15:03 +0800)

Trivial merge