Merge branch 'MDL-62600-master' of git://github.com/mickhawkins/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Aug 2018 00:53:30 +0000 (08:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 15 Aug 2018 00:53:30 +0000 (08:53 +0800)

Trivial merge