Merge branch 'MDL-62643-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Aug 2018 01:04:17 +0000 (09:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 14 Aug 2018 01:04:17 +0000 (09:04 +0800)

Trivial merge