Merge branch 'MDL-63772' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Nov 2018 01:36:09 +0000 (09:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 5 Nov 2018 01:36:09 +0000 (09:36 +0800)

Trivial merge