Merge branch 'MDL-63713-master' of git://github.com/rezaies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 02:08:32 +0000 (10:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Oct 2018 02:08:32 +0000 (10:08 +0800)

Trivial merge