Merge branch 'MDL-64393' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Feb 2019 07:11:20 +0000 (15:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 11 Feb 2019 07:11:20 +0000 (15:11 +0800)

Trivial merge