Merge branch 'MDL-60950-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jun 2018 03:36:59 +0000 (11:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jun 2018 03:36:59 +0000 (11:36 +0800)

Trivial merge