Merge branch 'MDL-53778' of https://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Jun 2019 00:35:56 +0000 (08:35 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 27 Jun 2019 00:35:56 +0000 (08:35 +0800)

Trivial merge