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

Trivial merge