Merge branch 'MDL-63303-master' of git://github.com/ryanwyllie/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Nov 2018 08:25:20 +0000 (16:25 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Nov 2018 08:25:20 +0000 (16:25 +0800)

Trivial merge