Merge branch 'MDL-61319-master' of git://github.com/bmbrands/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Jun 2019 00:09:24 +0000 (08:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Jun 2019 00:09:24 +0000 (08:09 +0800)

Trivial merge