Merge branch 'MDL-63680-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Oct 2018 00:21:27 +0000 (08:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 29 Oct 2018 00:21:27 +0000 (08:21 +0800)

Trivial merge