Merge branch 'MDL-63796-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 30 Oct 2018 01:38:46 +0000 (09:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 30 Oct 2018 01:38:46 +0000 (09:38 +0800)

Trivial merge