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

Trivial merge