Merge branch 'MDL-65754' of git://github.com/Chocolate-lightning/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Jun 2019 01:45:36 +0000 (09:45 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Jun 2019 01:45:36 +0000 (09:45 +0800)

Trivial merge