Merge branch 'MDL-62849-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 02:31:29 +0000 (10:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 02:31:29 +0000 (10:31 +0800)

Trivial merge