Merge branch 'MDL-64484' of https://github.com/paulholden/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Jun 2019 00:56:28 +0000 (08:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Jun 2019 00:56:28 +0000 (08:56 +0800)

Trivial merge