Merge branch 'MDL-62628-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jun 2018 01:49:18 +0000 (09:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jun 2018 01:49:18 +0000 (09:49 +0800)

Trivial merge