Merge branch 'MDL-63678-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 07:11:30 +0000 (15:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 07:11:30 +0000 (15:11 +0800)

Trivial merge