Merge branch 'MDL-61984-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 01:23:35 +0000 (09:23 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 Apr 2018 01:23:35 +0000 (09:23 +0800)

Trivial merge