Merge branch 'MDL-62234-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 01:51:18 +0000 (09:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jun 2018 01:51:18 +0000 (09:51 +0800)

Trivial merge