Merge branch 'MDL-61837-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Apr 2018 03:16:12 +0000 (11:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Apr 2018 03:16:12 +0000 (11:16 +0800)

Trivial merge