Merge branch 'MDL-60819-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jun 2018 00:58:49 +0000 (08:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jun 2018 00:58:49 +0000 (08:58 +0800)

Trivial merge