Merge branch 'MDL-63781' of https://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 00:15:43 +0000 (08:15 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 31 Oct 2018 00:15:43 +0000 (08:15 +0800)

Trivial merge