Merge branch 'MDL-62896-master' of git://github.com/k-holland/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Aug 2018 23:44:04 +0000 (07:44 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 13 Aug 2018 23:44:04 +0000 (07:44 +0800)

Trivial merge