Merge branch 'MDL-63289-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Oct 2018 00:19:59 +0000 (08:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Oct 2018 00:19:59 +0000 (08:19 +0800)

Trivial merge