Merge branch 'MDL-62782-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Aug 2018 23:06:22 +0000 (07:06 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 Aug 2018 23:06:22 +0000 (07:06 +0800)

Trivial merge